Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Terraform Provider Google v6.16.0 #697

Open
wants to merge 47 commits into
base: main
Choose a base branch
from
Open

Upgrade to Terraform Provider Google v6.16.0 #697

wants to merge 47 commits into from
+56,121 −10,508

Conversation

rickard-von-essen
Copy link
Contributor

@rickard-von-essen rickard-von-essen commented Jan 16, 2025 •
edited
Loading

Description of your changes

Update the underlaying Terraform Provider Goolge to version 6.16.0.

Depends on #695

TODO:

  • Review and test breaking changes, see TPG - v6 Upgrade Guide
  • Bump provider-upjet-gcp major version? Suggest to create v2.0.0.
  • Describe upgrade procedures, Suggest to create docs/family/Upgrade_v2.md
  • deletionProtection decide how to handle it (change default?)
  • Check if this fixes any issues

Changed resources:

  • activedirectory_* added deletionProtection
  • alloydb multiple changes
  • apigee_nataddresses added activate flag
  • artifact multiple changes
  • bigtable_appprofile added rowAffinity
  • bigtable_table added columnFamily.type
  • bigquery multiple changes
  • certificatemanager: added sanDnsnames
  • cloudbuild added privateServiceConnect
  • cloudplatform multiple changes
  • cloudrun_* multiple updates
  • cloudtasks multiple changes
  • composer multiple changes
  • compute_* multiple updates
  • containerattached_cluster add securityPostureConfig
  • container multiple changes
  • containeraws_nodepool added kubeletConfig
  • dataproc multiple changes
  • datastore_index removed
  • dialogflowcx_agent added loggingSettings and speechSettings
  • dns added externalEndpoints and healthcheck
  • filestore multiple changes
  • iam multiple changes
  • identity_platform: Replaced project_default_config with config
  • orgpolicy_policy added parameters
  • monitoring multiple changes
  • networkconnectivity multiple changes
  • pubsub multiple changes
  • redis_cluster multiple changes
  • sourcerepo added createIgnoreAlreadyExists to repository
  • spanner multiple changes
  • storage multiple changes
  • sql multiple changes
  • workflows_workflows added deletionProtection
  • vpcaccess_connector updated test

TODO
Fixes #694
Fixes #656
(probably) Fixes #685

I have:

  • Read and followed Crossplane's contribution process.
  • Run make reviewable to ensure this PR is ready for review.
  • N/A Added backport release-x.y labels to auto-backport this PR if necessary.

How has this code been tested

Executed some sanity check with:

UPTEST_EXAMPLE_LIST="examples/secretmanager/v1beta2/secret.yaml,examples/cloudplatform/v1beta1/serviceaccount.yaml"

[...]
--- PASS: kuttl (49.67s)
    --- PASS: kuttl/harness (0.00s)
        --- PASS: kuttl/harness/case (48.30s)
PASS
12:33:44 [ OK ] running automated tests

@mergenci
Copy link
Collaborator

Thanks for opening this PR @rickard-von-essen 🙏 Terraform provider major version bump to v6 requires many breaking changes, including field type changes. I don't think it will be easy to consider the impact of these changes and handle accordingly. So, please be patient if we were not able to invest enough resources into this PR in the near future.

In order to make the reviewing easier, can you divide your work into commits? You can see a previous Terraform provider bump PR, in which we even committed make generate output separately. For instance, while reviewing the current changes I was surprised to see that you removed and added resources. If I could have directly understood, by reading the commit title, that you did so because a resource was renamed, it would have been much easier for me to follow your work.

There is a categorical change that we might want to consider how to handle: There are many resources which have a new deletion_protection field that defaults to true. This is a Terraform field and doesn't exist in the external resource. We might want to default it to false, so that Crossplane users could continue deleting resources as they would. Crossplane Resource Model (XRM) has always acted as deletion_protection = true anyways. Nevertheless, we should discuss the implications. A question I have in mind, for instance, is whether this field currently exists in our existing resources. If so, we might prefer to continue with our current behavior. Not deviating from the Terraform-defined behavior would also be a good argument.

@rickard-von-essen rickard-von-essen force-pushed the tpg-v6.16.0 branch 2 times, most recently from c9c43f2 to 7859d44 Compare January 28, 2025 19:29
@rickard-von-essen rickard-von-essen marked this pull request as ready for review January 28, 2025 19:30
@rickard-von-essen
Update crossplane-runtime to v1.17.0 and upjet to db86f70a1651
de0a0f8 
Add new arg to conversion.RegisterConversions()

github.com/crossplane/crossplane-runtime v1.17.0
github.com/crossplane/upjet v1.4.1-0.20250108142216-db86f70a1651

Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
Update go.mod and Makefile to terraform-provider-google v6.16.0
8196856 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
Delete google_datastore_index
13ccceb 
Resource: google_datastore_index is now removed in favor of google_firestore_index
See https://github.com/hashicorp/terraform-provider-google/blob/v6.16.0/website/docs/guides/version_6_upgrade.html.markdown#resource-google_datastore_index-is-now-removed

Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
identityplatform: Replaced projectdefaultconfig with config
6c3dd56 
google_identity_platform_project_default_config is removed in favor of
google_identity_platform_project_config

See https://github.com/hashicorp/terraform-provider-google/blob/v6.16.0/website/docs/guides/version_6_upgrade.html.markdown#resource-google_identity_platform_project_default_config-is-now-removed

Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
Updates adding identityplatform_config and removing identityplatform_…
7d77f53 
…project_default_config, and datastore

Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
activedirectory: Added deletionProtection
7840017 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
apigee: Added activate flag to apigee_nataddresses
fafa666 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
appengine: Updated examples-generated
335a1f1 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
bigtable: Added bigtable_table columnFamily.type
8a66b7e 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
cloudrun: multiple changes
d3fd33b 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
compute: multiple changes
d3e7838 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
containeraws: added kubeletConfig
fe23ad2 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
dialogflowcx: agent added loggingSettings and speechSettings
4f1e879 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
dns: Added externalendpoints and healthcheck
7f933fa 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
gke: doc updates only
853dc1c 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
networkconnectivity: multiple changes
5b3ded1 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
orgpolicy: policy added parameters
d097981 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
privateca: doc updates only
cc6fdb7 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
redis: multiple changes for cluster
f2fd40f 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
spanner: multiple changes
05da4e9 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
sql: multiple changes
72e6e18 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
tags: doc updates only
368fd84 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
vpcaccess: doc and test updates only
2f519c5 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
alloydb: multiple changes
1ebf9f8 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
artifact: multiple changes
542be5e 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
bigquery: multiple changes
ebe7a09 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
certificatemanager: add san_dnsnames
91fd32c 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
cloudbuild: add private_service_connect
f17b0f3 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
cloudfunctions2: doc updates only
0da8389 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
cloudplatform: multiple changes
2079ce9 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
cloudtasks: multiple changes
5ec49c9 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
composer: multiple changes
02a838c 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
containerattached_cluster: add securityPostureConfig
3c1f842 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
container: multiple changes
435b6da 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
dataproc: multiple changes
3507581 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
filestore: multiple changes
dcf9540 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
iam: multiple changes
75b444a 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
identityplatform: internal only changes
6418b34 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
monitoring: multiple changes
da2f239 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
pubsub: multiple changes
602cdf0 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
sourcerepo: add createIgnoreAlreadyExists to repository
37f13ad 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
storage: multiple changes
1ff0ed1 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
Commited generated schema and metadata
8f03301 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
fmt
e78d986 
Signed-off-by: Rickard von Essen <[email protected]>
@rickard-von-essen
Copy link
Contributor Author

/test-examples="examples/activedirectory/v1beta1/domain.yaml,examples/alloydb/v1beta2/backup.yaml,examples/alloydb/v1beta2/instance.yaml,examples/alloydb/v1beta2/cluster.yaml,examples/alloydb/v1beta1/backup.yaml,examples/alloydb/v1beta1/instance.yaml,examples/alloydb/v1beta1/cluster.yaml,examples/artifact/v1beta2/registryrepository.yaml,examples/artifact/v1beta1/registryrepository.yaml,examples/apigee/v1beta1/nataddress.yaml"

@rickard-von-essen
Copy link
Contributor Author

/test-examples="examples/certificatemanager/v1beta2/certificate.yaml,examples/certificatemanager/v1beta1/certificate.yaml"

@rickard-von-essen
Copy link
Contributor Author

FYI provider-upjet-aws tpa major upgrade

@rickard-von-essen
Copy link
Contributor Author

/test-examples="examples/cloudbuild/v1beta2/workerpool.yaml"

@rickard-von-essen
Copy link
Contributor Author

/test-examples="examples/cloudplatform/v1beta2/serviceaccountiammember.yaml,examples/cloudplatform/v1beta2/projectiammember.yaml,examples/cloudplatform/v1beta1/projectiamauditconfig.yaml,examples/cloudplatform/v1beta1/serviceaccountkey.yaml,examples/cloudplatform/v1beta1/projectservice.yaml,examples/cloudplatform/v1beta1/projectusageexportbucket.yaml,examples/cloudplatform/v1beta1/serviceaccountiammember.yaml,examples/cloudplatform/v1beta1/serviceaccount.yaml,examples/cloudplatform/v1beta1/projectiammember.yaml"

@rickard-von-essen
Copy link
Contributor Author

/test-examples="examples/cloudrun/v1beta2/domainmapping.yaml,examples/cloudrun/v1beta2/v2job.yaml,examples/cloudrun/v1beta2/v2service.yaml,examples/cloudrun/v1beta1/domainmapping.yaml,examples/cloudrun/v1beta1/v2job.yaml,examples/cloudrun/v1beta1/v2service.yaml"

@rickard-von-essen
Remove deletionProtection
815be5f 
deletion_protection was added in Terraform to help protect from
remove/create a resource when you change an immutable attribute. This is
not allowed in Crossplane so this is unnecessary. Also this overlap with
Crossplane managementPolicy.

Signed-off-by: Rickard von Essen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ulucinar ulucinar Awaiting requested review from ulucinar ulucinar is a code owner

@sergenyalcin sergenyalcin Awaiting requested review from sergenyalcin sergenyalcin is a code owner

@turkenf turkenf Awaiting requested review from turkenf turkenf is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@rickard-von-essen @mergenci